From 1db3f617349e510fe61b2d2e422e5f2f1188e15e Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Sat, 17 Oct 2026 22:47:08 +0300 Subject: [PATCH] adapt for Asio 1.34 Gbp-Pq: Name 0002-adapt-for-Asio-1.34.patch --- src/http.cpp | 20 ++++++++++---------- src/peer_discovery.cpp | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/http.cpp b/src/http.cpp index 8290268..b0afe65 100644 --- a/src/http.cpp +++ b/src/http.cpp @@ -496,7 +496,7 @@ Connection::set_ssl_verification(const std::string& hostname, const asio::ssl::v } // starts from CA and goes down the presented chain - auto verifier = asio::ssl::rfc2818_verification(hostname); + auto verifier = asio::ssl::host_name_verification(hostname); bool verified = verifier(preverified, ctx); auto verify_ec = X509_STORE_CTX_get_error(ctx.native_handle()); if (verify_ec != 0 /*X509_V_OK*/ and logger) @@ -668,12 +668,12 @@ Connection::async_write(BytesHandlerCb cb) { std::lock_guard lock(mutex_); if (!is_open()) { - if (cb) ctx_.post([cb](){ cb(asio::error::broken_pipe, 0); }); + if (cb) asio::post(ctx_, [cb](){ cb(asio::error::broken_pipe, 0); }); return; } if (ssl_socket_) asio::async_write(*ssl_socket_, write_buf_, wrapCallback(std::move(cb))); else if (socket_) asio::async_write(*socket_, write_buf_, wrapCallback(std::move(cb))); - else if (cb) ctx_.post([cb](){ cb(asio::error::operation_aborted, 0); }); + else if (cb) asio::post(ctx_, [cb](){ cb(asio::error::operation_aborted, 0); }); } void @@ -681,12 +681,12 @@ Connection::async_read_until(const char* delim, BytesHandlerCb cb) { std::lock_guard lock(mutex_); if (!is_open()) { - if (cb) ctx_.post([cb](){ cb(asio::error::broken_pipe, 0); }); + asio::post(ctx_, [cb](){ cb(asio::error::broken_pipe, 0); }); return; } if (ssl_socket_) asio::async_read_until(*ssl_socket_, read_buf_, delim, wrapCallback(std::move(cb))); else if (socket_) asio::async_read_until(*socket_, read_buf_, delim, wrapCallback(std::move(cb))); - else if (cb) ctx_.post([cb](){ cb(asio::error::operation_aborted, 0); }); + else if (cb) asio::post(ctx_, [cb](){ cb(asio::error::operation_aborted, 0); }); } void @@ -694,12 +694,12 @@ Connection::async_read_until(char delim, BytesHandlerCb cb) { std::lock_guard lock(mutex_); if (!is_open()) { - if (cb) ctx_.post([cb](){ cb(asio::error::broken_pipe, 0); }); + if (cb) asio::post(ctx_, [cb](){ cb(asio::error::broken_pipe, 0); }); return; } if (ssl_socket_) asio::async_read_until(*ssl_socket_, read_buf_, delim, wrapCallback(std::move(cb))); else if (socket_) asio::async_read_until(*socket_, read_buf_, delim, wrapCallback(std::move(cb))); - else if (cb) ctx_.post([cb](){ cb(asio::error::operation_aborted, 0); }); + else if (cb) asio::post(ctx_, [cb](){ cb(asio::error::operation_aborted, 0); }); } void @@ -707,12 +707,12 @@ Connection::async_read(size_t bytes, BytesHandlerCb cb) { std::lock_guard lock(mutex_); if (!is_open()) { - if (cb) ctx_.post([cb](){ cb(asio::error::broken_pipe, 0); }); + if (cb) asio::post(ctx_, [cb](){ cb(asio::error::broken_pipe, 0); }); return; } if (ssl_socket_) asio::async_read(*ssl_socket_, read_buf_, asio::transfer_exactly(bytes), wrapCallback(std::move(cb))); else if (socket_) asio::async_read(*socket_, read_buf_, asio::transfer_exactly(bytes), wrapCallback(std::move(cb))); - else if (cb) ctx_.post([cb](){ cb(asio::error::operation_aborted, 0); }); + else if (cb) asio::post(ctx_, [cb](){ cb(asio::error::operation_aborted, 0); }); } void @@ -720,7 +720,7 @@ Connection::async_read_some(size_t bytes, BytesHandlerCb cb) { std::lock_guard lock(mutex_); if (!is_open()) { - if (cb) ctx_.post([cb](){ cb(asio::error::broken_pipe, 0); }); + if (cb) asio::post(ctx_, [cb](){ cb(asio::error::broken_pipe, 0); }); return; } auto buf = read_buf_.prepare(bytes); diff --git a/src/peer_discovery.cpp b/src/peer_discovery.cpp index 6fec07a..0887c8e 100644 --- a/src/peer_discovery.cpp +++ b/src/peer_discovery.cpp @@ -83,7 +83,7 @@ PeerDiscovery::DomainPeerDiscovery::DomainPeerDiscovery(asio::ip::udp domain, in : logger_(logger) , ioContext_(ioContext) , sockFd_(*ioContext_, domain) - , sockAddrSend_(asio::ip::address::from_string(domain.family() == AF_INET ? MULTICAST_ADDRESS_IPV4 + , sockAddrSend_(asio::ip::make_address(domain.family() == AF_INET ? MULTICAST_ADDRESS_IPV4 : MULTICAST_ADDRESS_IPV6), port) { try { @@ -110,7 +110,7 @@ PeerDiscovery::DomainPeerDiscovery::startDiscovery(const std::string &type, Serv callbackmap_[type] = callback; if (not drunning_) { drunning_ = true; - ioContext_->post([this] () { + asio::post(*ioContext_, [this] () { loopListener(); query(sockAddrSend_); }); @@ -216,7 +216,7 @@ PeerDiscovery::DomainPeerDiscovery::startPublish(const std::string &type, const messages_[type] = std::move(pack_buf_c); reloadMessages(); lrunning_ = true; - ioContext_->post([this] () { publish(sockAddrSend_); }); + asio::post(*ioContext_, [this] () { publish(sockAddrSend_); }); } bool -- 2.39.5